deprecate GtkDestroyNotify.

2008-06-18  Michael Natterer  <mitch@imendio.com>

	* gtk/gtktypeutils.h: deprecate GtkDestroyNotify.

	* gtk/gtkactiongroup.[ch]
	* gtk/gtkcombobox.[ch]
	* gtk/gtkcontainer.[ch]
	* gtk/gtkliststore.[ch]
	* gtk/gtkmain.[ch]
	* gtk/gtkmenu.c
	* gtk/gtkstock.[ch]
	* gtk/gtktreedatalist.[ch]
	* gtk/gtktreemodelfilter.[ch]
	* gtk/gtktreemodelsort.[ch]
	* gtk/gtktreeprivate.h
	* gtk/gtktreeselection.[ch]
	* gtk/gtktreesortable.[ch]
	* gtk/gtktreestore.[ch]
	* gtk/gtktreeview.[ch]
	* gtk/gtktreeviewcolumn.[ch]: s/GtkDestroyNotify/GDestroyNotify/g.

svn path=/trunk/; revision=20448

diff --git a/ChangeLog b/ChangeLog
index 04fe9677bed9ee481e3c13dd45e23954edffd978..7ba0c212678692ce99e8f2026e5fc8bf245e096d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2008-06-18  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtktypeutils.h: deprecate GtkDestroyNotify.
+
+       * gtk/gtkactiongroup.[ch]
+       * gtk/gtkcombobox.[ch]
+       * gtk/gtkcontainer.[ch]
+       * gtk/gtkliststore.[ch]
+       * gtk/gtkmain.[ch]
+       * gtk/gtkmenu.c
+       * gtk/gtkstock.[ch]
+       * gtk/gtktreedatalist.[ch]
+       * gtk/gtktreemodelfilter.[ch]
+       * gtk/gtktreemodelsort.[ch]
+       * gtk/gtktreeprivate.h
+       * gtk/gtktreeselection.[ch]
+       * gtk/gtktreesortable.[ch]
+       * gtk/gtktreestore.[ch]
+       * gtk/gtktreeview.[ch]
+       * gtk/gtktreeviewcolumn.[ch]: s/GtkDestroyNotify/GDestroyNotify/g.
+
 2008-06-18  Michael Natterer  <mitch@imendio.com>
 
        * tests/testgtk.c: some more undeprecation.

diff --git a/gtk/gtkactiongroup.c b/gtk/gtkactiongroup.c
index 6bba6e75b4a7d91987617fc133436373a8d1bfa7..f5eae0050285f6c004a87e0b7d49274a50ee1a0c 100644 (file)
--- a/gtk/gtkactiongroup.c
+++ b/gtk/gtkactiongroup.c
@@ -56,7 +56,7 @@ struct _GtkActionGroupPrivate
 
   GtkTranslateFunc translate_func;
   gpointer         translate_data;
-  GtkDestroyNotify translate_notify;   
+  GDestroyNotify   translate_notify;
 };
 
 enum 
@@ -1247,9 +1247,9 @@ gtk_action_group_add_radio_actions_full (GtkActionGroup            *action_group
  * @action_group: a #GtkActionGroup
  * @func: a #GtkTranslateFunc
  * @data: data to be passed to @func and @notify
- * @notify: a #GtkDestroyNotify function to be called when @action_group is 
+ * @notify: a #GDestroyNotify function to be called when @action_group is
  *   destroyed and when the translation function is changed again
- * 
+ *
  * Sets a function to be used for translating the @label and @tooltip of 
  * #GtkActionGroupEntry<!-- -->s added by gtk_action_group_add_actions().
  *
@@ -1262,7 +1262,7 @@ void
 gtk_action_group_set_translate_func (GtkActionGroup   *action_group,
                                     GtkTranslateFunc  func,
                                     gpointer          data,
-                                    GtkDestroyNotify  notify)
+                                    GDestroyNotify    notify)
 {
   g_return_if_fail (GTK_IS_ACTION_GROUP (action_group));
   

diff --git a/gtk/gtkactiongroup.h b/gtk/gtkactiongroup.h
index 17067b939dcf82f746eca8b736e72da58bb422bc..409c2b50fbd6980e2ebc130c50fc17cd48ca119a 100644 (file)
--- a/gtk/gtkactiongroup.h
+++ b/gtk/gtkactiongroup.h
@@ -161,7 +161,7 @@ void            gtk_action_group_add_radio_actions_full  (GtkActionGroup
 void            gtk_action_group_set_translate_func      (GtkActionGroup             *action_group,
                                                          GtkTranslateFunc            func,
                                                          gpointer                    data,
-                                                         GtkDestroyNotify            notify);
+                                                         GDestroyNotify              notify);
 void            gtk_action_group_set_translation_domain  (GtkActionGroup             *action_group,
                                                          const gchar                *domain);
 G_CONST_RETURN gchar *gtk_action_group_translate_string  (GtkActionGroup             *action_group,

diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index a88747e9085417d55923b08667394c52af39935d..b30226776cb19fa6e50f955b4eb7d9facd0f7cc0 100644 (file)
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -123,7 +123,7 @@ struct _GtkComboBoxPrivate
 
   GtkTreeViewRowSeparatorFunc row_separator_func;
   gpointer                    row_separator_data;
-  GtkDestroyNotify            row_separator_destroy;
+  GDestroyNotify              row_separator_destroy;
 
   gchar *tearoff_title;
 };
@@ -5640,7 +5640,7 @@ void
 gtk_combo_box_set_row_separator_func (GtkComboBox                 *combo_box,
                                      GtkTreeViewRowSeparatorFunc  func,
                                      gpointer                     data,
-                                     GtkDestroyNotify             destroy)
+                                     GDestroyNotify               destroy)
 {
   g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
 

diff --git a/gtk/gtkcombobox.h b/gtk/gtkcombobox.h
index cfead42d0def66889cfb052d4f360d077c6e1bfb..8f5e1456e1b2585d48c1162f15600fb6ee5f854b 100644 (file)
--- a/gtk/gtkcombobox.h
+++ b/gtk/gtkcombobox.h
@@ -112,7 +112,7 @@ GtkTreeViewRowSeparatorFunc gtk_combo_box_get_row_separator_func (GtkComboBox
 void                        gtk_combo_box_set_row_separator_func (GtkComboBox                *combo_box,
                                                                  GtkTreeViewRowSeparatorFunc func,
                                                                  gpointer                    data,
-                                                                 GtkDestroyNotify            destroy);
+                                                                 GDestroyNotify              destroy);
 
 /* convenience -- text */
 GtkWidget    *gtk_combo_box_new_text         (void);

diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index c81a37211982d56b4fd95de23f0eb0583322d337..ea2cb6f9e406bdce7b12a445747204bfa976a486 100644 (file)
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -1512,7 +1512,7 @@ gtk_container_foreach_full (GtkContainer       *container,
                            GtkCallback         callback,
                            GtkCallbackMarshal  marshal,
                            gpointer            callback_data,
-                           GtkDestroyNotify    notify)
+                           GDestroyNotify      notify)
 {
   g_return_if_fail (GTK_IS_CONTAINER (container));
 

diff --git a/gtk/gtkcontainer.h b/gtk/gtkcontainer.h
index 2154160895844085a48b662c05acbf4e24618943..5fd10d10f1618b0029d4bacd3068a7c9ffad66f9 100644 (file)
--- a/gtk/gtkcontainer.h
+++ b/gtk/gtkcontainer.h
@@ -129,7 +129,7 @@ void     gtk_container_foreach_full (GtkContainer       *container,
                                     GtkCallback         callback,
                                     GtkCallbackMarshal  marshal,
                                     gpointer            callback_data,
-                                    GtkDestroyNotify    notify);
+                                    GDestroyNotify      notify);
 #endif /*  GTK_DISABLE_DEPRECATED */
 GList*   gtk_container_get_children     (GtkContainer       *container);
 

diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c
index f71836e1c31e77a4166aa2cd4fe1a64a5de63819..4ae9922cf30ba36299cd763e1fece9f17601e869 100644 (file)
--- a/gtk/gtkliststore.c
+++ b/gtk/gtkliststore.c
@@ -111,11 +111,11 @@ static void     gtk_list_store_set_sort_func         (GtkTreeSortable        *so
                                                      gint                    sort_column_id,
                                                      GtkTreeIterCompareFunc  func,
                                                      gpointer                data,
-                                                     GtkDestroyNotify        destroy);
+                                                     GDestroyNotify          destroy);
 static void     gtk_list_store_set_default_sort_func (GtkTreeSortable        *sortable,
                                                      GtkTreeIterCompareFunc  func,
                                                      gpointer                data,
-                                                     GtkDestroyNotify        destroy);
+                                                     GDestroyNotify          destroy);
 static gboolean gtk_list_store_has_default_sort_func (GtkTreeSortable        *sortable);
 
 
@@ -392,7 +392,7 @@ gtk_list_store_finalize (GObject *object)
   
   if (list_store->default_sort_destroy)
     {
-      GtkDestroyNotify d = list_store->default_sort_destroy;
+      GDestroyNotify d = list_store->default_sort_destroy;
 
       list_store->default_sort_destroy = NULL;
       d (list_store->default_sort_data);
@@ -1831,7 +1831,7 @@ gtk_list_store_set_sort_func (GtkTreeSortable        *sortable,
                              gint                    sort_column_id,
                              GtkTreeIterCompareFunc  func,
                              gpointer                data,
-                             GtkDestroyNotify        destroy)
+                             GDestroyNotify          destroy)
 {
   GtkListStore *list_store = (GtkListStore *) sortable;
 
@@ -1847,13 +1847,13 @@ static void
 gtk_list_store_set_default_sort_func (GtkTreeSortable        *sortable,
                                      GtkTreeIterCompareFunc  func,
                                      gpointer                data,
-                                     GtkDestroyNotify        destroy)
+                                     GDestroyNotify          destroy)
 {
   GtkListStore *list_store = (GtkListStore *) sortable;
 
   if (list_store->default_sort_destroy)
     {
-      GtkDestroyNotify d = list_store->default_sort_destroy;
+      GDestroyNotify d = list_store->default_sort_destroy;
 
       list_store->default_sort_destroy = NULL;
       d (list_store->default_sort_data);

diff --git a/gtk/gtkliststore.h b/gtk/gtkliststore.h
index 656805a99acaef1031d58029d2484fe8793bfdd1..8f06b2d5af43bdc8ff3907900b4926a772c60d7c 100644 (file)
--- a/gtk/gtkliststore.h
+++ b/gtk/gtkliststore.h
@@ -57,7 +57,7 @@ struct _GtkListStore
   gint length;
   GtkTreeIterCompareFunc default_sort_func;
   gpointer default_sort_data;
-  GtkDestroyNotify default_sort_destroy;
+  GDestroyNotify default_sort_destroy;
   guint columns_dirty : 1;
 };
 

diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 3b1e0b1c4bef22535b508bb03f79bdb0d8071c4a..e1c37b67087c1becfdc0036bea0cdccb302c7260 100644 (file)
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -127,14 +127,14 @@ struct _GtkQuitFunction
   GtkCallbackMarshal marshal;
   GtkFunction function;
   gpointer data;
-  GtkDestroyNotify destroy;
+  GDestroyNotify destroy;
 };
 
 struct _GtkClosure
 {
   GtkCallbackMarshal marshal;
   gpointer data;
-  GtkDestroyNotify destroy;
+  GDestroyNotify destroy;
 };
 
 struct _GtkKeySnooperData
@@ -1867,7 +1867,7 @@ gtk_quit_add_full (guint          main_level,
                   GtkFunction          function,
                   GtkCallbackMarshal   marshal,
                   gpointer             data,
-                  GtkDestroyNotify     destroy)
+                  GDestroyNotify       destroy)
 {
   static guint quit_id = 1;
   GtkQuitFunction *quitf;
@@ -1985,7 +1985,7 @@ gtk_timeout_add_full (guint32              interval,
                      GtkFunction        function,
                      GtkCallbackMarshal marshal,
                      gpointer           data,
-                     GtkDestroyNotify   destroy)
+                     GDestroyNotify     destroy)
 {
   if (marshal)
     {
@@ -2024,7 +2024,7 @@ gtk_idle_add_full (gint                   priority,
                   GtkFunction          function,
                   GtkCallbackMarshal   marshal,
                   gpointer             data,
-                  GtkDestroyNotify     destroy)
+                  GDestroyNotify       destroy)
 {
   if (marshal)
     {
@@ -2078,7 +2078,7 @@ gtk_input_add_full (gint          source,
                    GdkInputFunction    function,
                    GtkCallbackMarshal  marshal,
                    gpointer            data,
-                   GtkDestroyNotify    destroy)
+                   GDestroyNotify      destroy)
 {
   if (marshal)
     {

diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h
index 5529d7696fcf511023abc9f17f94b7d56f65d3fd..975057e86484a69b808d4f9ad44352845399edc0 100644 (file)
--- a/gtk/gtkmain.h
+++ b/gtk/gtkmain.h
@@ -167,7 +167,7 @@ guint          gtk_quit_add_full       (guint              main_level,
                                    GtkFunction        function,
                                    GtkCallbackMarshal marshal,
                                    gpointer           data,
-                                   GtkDestroyNotify   destroy);
+                                   GDestroyNotify     destroy);
 void      gtk_quit_remove         (guint              quit_handler_id);
 void      gtk_quit_remove_by_data (gpointer           data);
 #ifndef GTK_DISABLE_DEPRECATED
@@ -178,7 +178,7 @@ guint          gtk_timeout_add_full    (guint32            interval,
                                    GtkFunction        function,
                                    GtkCallbackMarshal marshal,
                                    gpointer           data,
-                                   GtkDestroyNotify   destroy);
+                                   GDestroyNotify     destroy);
 void      gtk_timeout_remove      (guint              timeout_handler_id);
 
 guint     gtk_idle_add            (GtkFunction        function,
@@ -190,7 +190,7 @@ guint          gtk_idle_add_full       (gint               priority,
                                    GtkFunction        function,
                                    GtkCallbackMarshal marshal,
                                    gpointer           data,
-                                   GtkDestroyNotify   destroy);
+                                   GDestroyNotify     destroy);
 void      gtk_idle_remove         (guint              idle_handler_id);
 void      gtk_idle_remove_by_data (gpointer           data);
 guint     gtk_input_add_full      (gint               source,
@@ -198,7 +198,7 @@ guint          gtk_input_add_full      (gint               source,
                                    GdkInputFunction   function,
                                    GtkCallbackMarshal marshal,
                                    gpointer           data,
-                                   GtkDestroyNotify   destroy);
+                                   GDestroyNotify     destroy);
 void      gtk_input_remove        (guint              input_handler_id);
 #endif /* GTK_DISABLE_DEPRECATED */
 

diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 75fad41251457542778cb5b225862fca972a579c..8ea3ba866a5b3828d1717b830ab59b1ae5e601dd 100644 (file)
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -1033,8 +1033,9 @@ gtk_menu_attach_to_widget (GtkMenu               *menu,
     {
       list = g_list_prepend (list, menu);
     }
-  g_object_set_data_full (G_OBJECT (attach_widget), I_(ATTACHED_MENUS), list, (GtkDestroyNotify) g_list_free);
-  
+  g_object_set_data_full (G_OBJECT (attach_widget), I_(ATTACHED_MENUS), list,
+                          (GDestroyNotify) g_list_free);
+
   if (GTK_WIDGET_STATE (menu) != GTK_STATE_NORMAL)
     gtk_widget_set_state (GTK_WIDGET (menu), GTK_STATE_NORMAL);
   
@@ -1086,7 +1087,8 @@ gtk_menu_detach (GtkMenu *menu)
   list = g_object_steal_data (G_OBJECT (data->attach_widget), ATTACHED_MENUS);
   list = g_list_remove (list, menu);
   if (list)
-    g_object_set_data_full (G_OBJECT (data->attach_widget), I_(ATTACHED_MENUS), list, (GtkDestroyNotify) g_list_free);
+    g_object_set_data_full (G_OBJECT (data->attach_widget), I_(ATTACHED_MENUS), list,
+                            (GDestroyNotify) g_list_free);
   else
     g_object_set_data (G_OBJECT (data->attach_widget), I_(ATTACHED_MENUS), NULL);
   

diff --git a/gtk/gtkstock.c b/gtk/gtkstock.c
index 76f10fc4b183f04389ae8bdd0bfc5a23b7bccee8..35698ca289265abfa37f724e15773ac164b65da6 100644 (file)
--- a/gtk/gtkstock.c
+++ b/gtk/gtkstock.c
@@ -47,7 +47,7 @@ struct _GtkStockTranslateFunc
 {
   GtkTranslateFunc func;
   gpointer data;
-  GtkDestroyNotify notify;
+  GDestroyNotify notify;
 };
 
 static void
@@ -410,7 +410,7 @@ static const GtkStockItem builtin_items [] =
  * @domain: the translation domain for which @func shall be used
  * @func: a #GtkTranslateFunc 
  * @data: data to pass to @func
- * @notify: a #GtkDestroyNotify that is called when @data is 
+ * @notify: a #GDestroyNotify that is called when @data is
  *   no longer needed
  *
  * Sets a function to be used for translating the @label of 
@@ -426,7 +426,7 @@ void
 gtk_stock_set_translate_func (const gchar      *domain,
                              GtkTranslateFunc  func,
                              gpointer          data,
-                             GtkDestroyNotify  notify)
+                             GDestroyNotify    notify)
 {
   GtkStockTranslateFunc *translate;
   gchar *domainname;

diff --git a/gtk/gtkstock.h b/gtk/gtkstock.h
index 80ec1ec9d7ab641f216771a9e8f70b5163aa682e..f259d89dec0c76d11d9445d66619d5c20b934409 100644 (file)
--- a/gtk/gtkstock.h
+++ b/gtk/gtkstock.h
@@ -66,7 +66,7 @@ void          gtk_stock_item_free (GtkStockItem       *item);
 void          gtk_stock_set_translate_func (const gchar      *domain,
                                            GtkTranslateFunc  func,
                                            gpointer          data,
-                                           GtkDestroyNotify  notify);
+                                           GDestroyNotify    notify);
 
 /* Stock IDs (not all are stock items; some are images only) */
 #define GTK_STOCK_DIALOG_AUTHENTICATION \

diff --git a/gtk/gtktreedatalist.c b/gtk/gtktreedatalist.c
index 8643b79cc4d215d42390a72b1f34a76f88b4c74f..5c709430e942fd29c32ed03cf538296df7c5f382 100644 (file)
--- a/gtk/gtktreedatalist.c
+++ b/gtk/gtktreedatalist.c
@@ -483,7 +483,7 @@ _gtk_tree_data_list_header_free (GList *list)
 
       if (header->destroy)
        {
-         GtkDestroyNotify d = header->destroy;
+         GDestroyNotify d = header->destroy;
 
          header->destroy = NULL;
          d (header->data);
@@ -515,7 +515,7 @@ _gtk_tree_data_list_set_header (GList                  *header_list,
                                gint                    sort_column_id,
                                GtkTreeIterCompareFunc  func,
                                gpointer                data,
-                               GtkDestroyNotify        destroy)
+                               GDestroyNotify          destroy)
 {
   GList *list = header_list;
   GtkTreeDataSortHeader *header = NULL;
@@ -543,7 +543,7 @@ _gtk_tree_data_list_set_header (GList                  *header_list,
 
   if (header->destroy)
     {
-      GtkDestroyNotify d = header->destroy;
+      GDestroyNotify d = header->destroy;
       
       header->destroy = NULL;
       d (header->data);

diff --git a/gtk/gtktreedatalist.h b/gtk/gtktreedatalist.h
index bd1928d78971b7ccdda055650d513eb8637c5d46..cfd81b57d5b1751518b4817c3455cb3e3128ac68 100644 (file)
--- a/gtk/gtktreedatalist.h
+++ b/gtk/gtktreedatalist.h
@@ -47,7 +47,7 @@ typedef struct _GtkTreeDataSortHeader
   gint sort_column_id;
   GtkTreeIterCompareFunc func;
   gpointer data;
-  GtkDestroyNotify destroy;
+  GDestroyNotify destroy;
 } GtkTreeDataSortHeader;
 
 GtkTreeDataList *_gtk_tree_data_list_alloc          (void);
@@ -77,6 +77,6 @@ GList                 *_gtk_tree_data_list_set_header  (GList                  *
                                                        gint                    sort_column_id,
                                                        GtkTreeIterCompareFunc  func,
                                                        gpointer                data,
-                                                       GtkDestroyNotify        destroy);
+                                                       GDestroyNotify          destroy);
 
 #endif /* __GTK_TREE_DATA_LIST_H__ */

diff --git a/gtk/gtktreemodelfilter.c b/gtk/gtktreemodelfilter.c
index 7a4aa69314582a047a0f7f08d36742842f97364b..8e6da2c836f11a4f64ead3f0016c665ff1ff3c6f 100644 (file)
--- a/gtk/gtktreemodelfilter.c
+++ b/gtk/gtktreemodelfilter.c
@@ -91,13 +91,13 @@ struct _GtkTreeModelFilterPrivate
 
   GtkTreeModelFilterVisibleFunc visible_func;
   gpointer visible_data;
-  GtkDestroyNotify visible_destroy;
+  GDestroyNotify visible_destroy;
 
   gint modify_n_columns;
   GType *modify_types;
   GtkTreeModelFilterModifyFunc modify_func;
   gpointer modify_data;
-  GtkDestroyNotify modify_destroy;
+  GDestroyNotify modify_destroy;
 
   gint visible_column;
 
@@ -2890,7 +2890,7 @@ void
 gtk_tree_model_filter_set_visible_func (GtkTreeModelFilter            *filter,
                                         GtkTreeModelFilterVisibleFunc  func,
                                         gpointer                       data,
-                                        GtkDestroyNotify               destroy)
+                                        GDestroyNotify                 destroy)
 {
   g_return_if_fail (GTK_IS_TREE_MODEL_FILTER (filter));
   g_return_if_fail (func != NULL);
@@ -2898,7 +2898,7 @@ gtk_tree_model_filter_set_visible_func (GtkTreeModelFilter            *filter,
 
   if (filter->priv->visible_func)
     {
-      GtkDestroyNotify d = filter->priv->visible_destroy;
+      GDestroyNotify d = filter->priv->visible_destroy;
 
       filter->priv->visible_destroy = NULL;
       d (filter->priv->visible_data);
@@ -2936,7 +2936,7 @@ gtk_tree_model_filter_set_modify_func (GtkTreeModelFilter           *filter,
                                        GType                        *types,
                                        GtkTreeModelFilterModifyFunc  func,
                                        gpointer                      data,
-                                       GtkDestroyNotify              destroy)
+                                       GDestroyNotify                destroy)
 {
   g_return_if_fail (GTK_IS_TREE_MODEL_FILTER (filter));
   g_return_if_fail (func != NULL);
@@ -2944,7 +2944,7 @@ gtk_tree_model_filter_set_modify_func (GtkTreeModelFilter           *filter,
 
   if (filter->priv->modify_destroy)
     {
-      GtkDestroyNotify d = filter->priv->modify_destroy;
+      GDestroyNotify d = filter->priv->modify_destroy;
 
       filter->priv->modify_destroy = NULL;
       d (filter->priv->modify_data);

diff --git a/gtk/gtktreemodelfilter.h b/gtk/gtktreemodelfilter.h
index 43d3e06127f56da4852dc25972b9c47c0dcc32c5..5c0677570906051ac03a395c4743ff9b203bf0b7 100644 (file)
--- a/gtk/gtktreemodelfilter.h
+++ b/gtk/gtktreemodelfilter.h
@@ -75,13 +75,13 @@ GtkTreeModel *gtk_tree_model_filter_new                        (GtkTreeModel
 void          gtk_tree_model_filter_set_visible_func           (GtkTreeModelFilter           *filter,
                                                                 GtkTreeModelFilterVisibleFunc func,
                                                                 gpointer                      data,
-                                                                GtkDestroyNotify              destroy);
+                                                                GDestroyNotify                destroy);
 void          gtk_tree_model_filter_set_modify_func            (GtkTreeModelFilter           *filter,
                                                                 gint                          n_columns,
                                                                 GType                        *types,
                                                                 GtkTreeModelFilterModifyFunc  func,
                                                                 gpointer                      data,
-                                                                GtkDestroyNotify              destroy);
+                                                                GDestroyNotify                destroy);
 void          gtk_tree_model_filter_set_visible_column         (GtkTreeModelFilter           *filter,
                                                                 gint                          column);
 

diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c
index 8e90126fe1e76635fb78dbafea6c05244471eb14..743e058ce69e70aedbb219f204c31cdef9c70d21 100644 (file)
--- a/gtk/gtktreemodelsort.c
+++ b/gtk/gtktreemodelsort.c
@@ -201,11 +201,11 @@ static void         gtk_tree_model_sort_set_sort_func         (GtkTreeSortable
                                                               gint                    sort_column_id,
                                                               GtkTreeIterCompareFunc  func,
                                                               gpointer                data,
-                                                              GtkDestroyNotify        destroy);
+                                                              GDestroyNotify          destroy);
 static void         gtk_tree_model_sort_set_default_sort_func (GtkTreeSortable        *sortable,
                                                               GtkTreeIterCompareFunc  func,
                                                               gpointer                data,
-                                                              GtkDestroyNotify        destroy);
+                                                              GDestroyNotify          destroy);
 static gboolean     gtk_tree_model_sort_has_default_sort_func (GtkTreeSortable     *sortable);
 
 /* Private functions (sort funcs, level handling and other utils) */
@@ -1356,7 +1356,7 @@ gtk_tree_model_sort_set_sort_func (GtkTreeSortable        *sortable,
                                   gint                    sort_column_id,
                                   GtkTreeIterCompareFunc  func,
                                   gpointer                data,
-                                  GtkDestroyNotify        destroy)
+                                  GDestroyNotify          destroy)
 {
   GtkTreeModelSort *tree_model_sort = (GtkTreeModelSort *) sortable;
 
@@ -1372,13 +1372,13 @@ static void
 gtk_tree_model_sort_set_default_sort_func (GtkTreeSortable        *sortable,
                                           GtkTreeIterCompareFunc  func,
                                           gpointer                data,
-                                          GtkDestroyNotify        destroy)
+                                          GDestroyNotify          destroy)
 {
   GtkTreeModelSort *tree_model_sort = (GtkTreeModelSort *)sortable;
 
   if (tree_model_sort->default_sort_destroy)
     {
-      GtkDestroyNotify d = tree_model_sort->default_sort_destroy;
+      GDestroyNotify d = tree_model_sort->default_sort_destroy;
 
       tree_model_sort->default_sort_destroy = NULL;
       d (tree_model_sort->default_sort_data);
@@ -2398,7 +2398,7 @@ gtk_tree_model_sort_reset_default_sort_func (GtkTreeModelSort *tree_model_sort)
 
   if (tree_model_sort->default_sort_destroy)
     {
-      GtkDestroyNotify d = tree_model_sort->default_sort_destroy;
+      GDestroyNotify d = tree_model_sort->default_sort_destroy;
 
       tree_model_sort->default_sort_destroy = NULL;
       d (tree_model_sort->default_sort_data);

diff --git a/gtk/gtktreemodelsort.h b/gtk/gtktreemodelsort.h
index d053f86ea6624c0572c8ef6d0cd73d7684d8bae4..64b7acfad684a19ebd7168f0a36d43ed61117741 100644 (file)
--- a/gtk/gtktreemodelsort.h
+++ b/gtk/gtktreemodelsort.h
@@ -58,7 +58,7 @@ struct _GtkTreeModelSort
   /* default sort */
   GtkTreeIterCompareFunc default_sort_func;
   gpointer default_sort_data;
-  GtkDestroyNotify default_sort_destroy;
+  GDestroyNotify default_sort_destroy;
 
   /* signal ids */
   guint changed_id;

diff --git a/gtk/gtktreeprivate.h b/gtk/gtktreeprivate.h
index 7fe4d0ced9125b503892d1eecb2a35ac4fb3d622..51bb9511f87326d3f32918786740c345b4dcae20 100644 (file)
--- a/gtk/gtktreeprivate.h
+++ b/gtk/gtktreeprivate.h
@@ -159,14 +159,14 @@ struct _GtkTreeViewPrivate
 
   GtkTreeViewColumnDropFunc column_drop_func;
   gpointer column_drop_func_data;
-  GtkDestroyNotify column_drop_func_data_destroy;
+  GDestroyNotify column_drop_func_data_destroy;
   GList *column_drag_info;
   GtkTreeViewColumnReorder *cur_reorder;
 
   /* ATK Hack */
   GtkTreeDestroyCountFunc destroy_count_func;
   gpointer destroy_count_data;
-  GtkDestroyNotify destroy_count_destroy;
+  GDestroyNotify destroy_count_destroy;
 
   /* Scroll timeout (e.g. during dnd) */
   guint scroll_timeout;
@@ -245,7 +245,7 @@ struct _GtkTreeViewPrivate
   GtkTreeViewSearchPositionFunc search_position_func;
   GtkTreeViewSearchEqualFunc search_equal_func;
   gpointer search_user_data;
-  GtkDestroyNotify search_destroy;
+  GDestroyNotify search_destroy;
   gpointer search_position_user_data;
   GDestroyNotify search_position_destroy;
   GtkWidget *search_window;
@@ -257,7 +257,7 @@ struct _GtkTreeViewPrivate
 
   GtkTreeViewRowSeparatorFunc row_separator_func;
   gpointer row_separator_data;
-  GtkDestroyNotify row_separator_destroy;
+  GDestroyNotify row_separator_destroy;
 
   gint level_indentation;
 

diff --git a/gtk/gtktreeselection.c b/gtk/gtktreeselection.c
index 75889851c60c32ce8c326cce1be1dcaa1ec7cacf..130c14d65867b2bd003717bee37e6a16ee7b63fb 100644 (file)
--- a/gtk/gtktreeselection.c
+++ b/gtk/gtktreeselection.c
@@ -77,7 +77,7 @@ gtk_tree_selection_finalize (GObject *object)
 
   if (selection->destroy)
     {
-      GtkDestroyNotify d = selection->destroy;
+      GDestroyNotify d = selection->destroy;
 
       selection->destroy = NULL;
       d (selection->user_data);
@@ -256,14 +256,14 @@ void
 gtk_tree_selection_set_select_function (GtkTreeSelection     *selection,
                                        GtkTreeSelectionFunc  func,
                                        gpointer              data,
-                                       GtkDestroyNotify      destroy)
+                                       GDestroyNotify        destroy)
 {
   g_return_if_fail (GTK_IS_TREE_SELECTION (selection));
   g_return_if_fail (func != NULL);
 
   if (selection->destroy)
     {
-      GtkDestroyNotify d = selection->destroy;
+      GDestroyNotify d = selection->destroy;
 
       selection->destroy = NULL;
       d (selection->user_data);

diff --git a/gtk/gtktreeselection.h b/gtk/gtktreeselection.h
index eb19aa53834847a4ae9321871f5a8286b18ecb97..6036dfc9d2cc088b4b1b6ba6732cb18c5f43c670 100644 (file)
--- a/gtk/gtktreeselection.h
+++ b/gtk/gtktreeselection.h
@@ -58,7 +58,7 @@ struct _GtkTreeSelection
   GtkSelectionMode type;
   GtkTreeSelectionFunc user_func;
   gpointer user_data;
-  GtkDestroyNotify destroy;
+  GDestroyNotify destroy;
 };
 
 struct _GtkTreeSelectionClass
@@ -83,7 +83,7 @@ GtkSelectionMode gtk_tree_selection_get_mode        (GtkTreeSelection
 void             gtk_tree_selection_set_select_function (GtkTreeSelection            *selection,
                                                         GtkTreeSelectionFunc         func,
                                                         gpointer                     data,
-                                                        GtkDestroyNotify             destroy);
+                                                        GDestroyNotify               destroy);
 gpointer         gtk_tree_selection_get_user_data       (GtkTreeSelection            *selection);
 GtkTreeView*     gtk_tree_selection_get_tree_view       (GtkTreeSelection            *selection);
 

diff --git a/gtk/gtktreesortable.c b/gtk/gtktreesortable.c
index 1987d77972894ea7649be46417ff15c57553ad4b..cabaf5baddf89bdd5f5ebd7e9e60bd3cb8d99b54 100644 (file)
--- a/gtk/gtktreesortable.c
+++ b/gtk/gtktreesortable.c
@@ -165,7 +165,7 @@ gtk_tree_sortable_set_sort_func (GtkTreeSortable        *sortable,
                                 gint                    sort_column_id,
                                 GtkTreeIterCompareFunc  sort_func,
                                 gpointer                user_data,
-                                GtkDestroyNotify        destroy)
+                                GDestroyNotify          destroy)
 {
   GtkTreeSortableIface *iface;
 
@@ -202,7 +202,7 @@ void
 gtk_tree_sortable_set_default_sort_func (GtkTreeSortable        *sortable,
                                         GtkTreeIterCompareFunc  sort_func,
                                         gpointer                user_data,
-                                        GtkDestroyNotify        destroy)
+                                        GDestroyNotify          destroy)
 {
   GtkTreeSortableIface *iface;
 

diff --git a/gtk/gtktreesortable.h b/gtk/gtktreesortable.h
index ca9311fa1b022f4646341d1d56497b17a3ff0bab..17e7f940b80ab28b348df1c4f796e6531a48b9a9 100644 (file)
--- a/gtk/gtktreesortable.h
+++ b/gtk/gtktreesortable.h
@@ -68,11 +68,11 @@ struct _GtkTreeSortableIface
                                      gint                    sort_column_id,
                                      GtkTreeIterCompareFunc  func,
                                      gpointer                data,
-                                     GtkDestroyNotify        destroy);
+                                     GDestroyNotify          destroy);
   void     (* set_default_sort_func) (GtkTreeSortable        *sortable,
                                      GtkTreeIterCompareFunc  func,
                                      gpointer                data,
-                                     GtkDestroyNotify        destroy);
+                                     GDestroyNotify          destroy);
   gboolean (* has_default_sort_func) (GtkTreeSortable        *sortable);
 };
 
@@ -90,14 +90,13 @@ void     gtk_tree_sortable_set_sort_func         (GtkTreeSortable        *sortab
                                                  gint                    sort_column_id,
                                                  GtkTreeIterCompareFunc  sort_func,
                                                  gpointer                user_data,
-                                                 GtkDestroyNotify        destroy);
+                                                 GDestroyNotify          destroy);
 void     gtk_tree_sortable_set_default_sort_func (GtkTreeSortable        *sortable,
                                                  GtkTreeIterCompareFunc  sort_func,
                                                  gpointer                user_data,
-                                                 GtkDestroyNotify        destroy);
+                                                 GDestroyNotify          destroy);
 gboolean gtk_tree_sortable_has_default_sort_func (GtkTreeSortable        *sortable);
-                                                 
-                                                 
+
 G_END_DECLS
 
 #endif /* __GTK_TREE_SORTABLE_H__ */

diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c
index e74259b57994c1e4d5177f2112cea9d2178aef31..dcacbbbec392288cec32f12c4260cd6e6f16ee62 100644 (file)
--- a/gtk/gtktreestore.c
+++ b/gtk/gtktreestore.c
@@ -110,11 +110,11 @@ static void     gtk_tree_store_set_sort_func           (GtkTreeSortable        *
                                                        gint                    sort_column_id,
                                                        GtkTreeIterCompareFunc  func,
                                                        gpointer                data,
-                                                       GtkDestroyNotify        destroy);
+                                                       GDestroyNotify          destroy);
 static void     gtk_tree_store_set_default_sort_func   (GtkTreeSortable        *sortable,
                                                        GtkTreeIterCompareFunc  func,
                                                        gpointer                data,
-                                                       GtkDestroyNotify        destroy);
+                                                       GDestroyNotify          destroy);
 static gboolean gtk_tree_store_has_default_sort_func   (GtkTreeSortable        *sortable);
 
 
@@ -431,7 +431,7 @@ gtk_tree_store_finalize (GObject *object)
 
   if (tree_store->default_sort_destroy)
     {
-      GtkDestroyNotify d = tree_store->default_sort_destroy;
+      GDestroyNotify d = tree_store->default_sort_destroy;
 
       tree_store->default_sort_destroy = NULL;
       d (tree_store->default_sort_data);
@@ -3139,7 +3139,7 @@ gtk_tree_store_set_sort_func (GtkTreeSortable        *sortable,
                              gint                    sort_column_id,
                              GtkTreeIterCompareFunc  func,
                              gpointer                data,
-                             GtkDestroyNotify        destroy)
+                             GDestroyNotify          destroy)
 {
   GtkTreeStore *tree_store = (GtkTreeStore *) sortable;
 
@@ -3155,13 +3155,13 @@ static void
 gtk_tree_store_set_default_sort_func (GtkTreeSortable        *sortable,
                                      GtkTreeIterCompareFunc  func,
                                      gpointer                data,
-                                     GtkDestroyNotify        destroy)
+                                     GDestroyNotify          destroy)
 {
   GtkTreeStore *tree_store = (GtkTreeStore *) sortable;
 
   if (tree_store->default_sort_destroy)
     {
-      GtkDestroyNotify d = tree_store->default_sort_destroy;
+      GDestroyNotify d = tree_store->default_sort_destroy;
 
       tree_store->default_sort_destroy = NULL;
       d (tree_store->default_sort_data);

diff --git a/gtk/gtktreestore.h b/gtk/gtktreestore.h
index 7eb2711483b9f18d60035a230f66788b6a4c3237..57de364cae5fb9fbeea71e45749ee0e6d9295820 100644 (file)
--- a/gtk/gtktreestore.h
+++ b/gtk/gtktreestore.h
@@ -56,7 +56,7 @@ struct _GtkTreeStore
   GType *column_headers;
   GtkTreeIterCompareFunc default_sort_func;
   gpointer default_sort_data;
-  GtkDestroyNotify default_sort_destroy;
+  GDestroyNotify default_sort_destroy;
   guint columns_dirty : 1;
 };
 

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index f2deab23208678fdfc65ae5cee1416f2087836b2..ab28e6bb95af2eb582d8b80dcf3943d4c3a134c8 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -11496,7 +11496,7 @@ void
 gtk_tree_view_set_column_drag_function (GtkTreeView               *tree_view,
                                        GtkTreeViewColumnDropFunc  func,
                                        gpointer                   user_data,
-                                       GtkDestroyNotify           destroy)
+                                       GDestroyNotify             destroy)
 {
   g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
 
@@ -13779,7 +13779,7 @@ void
 gtk_tree_view_set_destroy_count_func (GtkTreeView             *tree_view,
                                      GtkTreeDestroyCountFunc  func,
                                      gpointer                 data,
-                                     GtkDestroyNotify         destroy)
+                                     GDestroyNotify           destroy)
 {
   g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
 
@@ -13917,7 +13917,7 @@ void
 gtk_tree_view_set_search_equal_func (GtkTreeView                *tree_view,
                                     GtkTreeViewSearchEqualFunc  search_equal_func,
                                     gpointer                    search_user_data,
-                                    GtkDestroyNotify            search_destroy)
+                                    GDestroyNotify              search_destroy)
 {
   g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
   g_return_if_fail (search_equal_func != NULL);
@@ -14982,10 +14982,10 @@ gtk_tree_view_get_row_separator_func (GtkTreeView *tree_view)
  * Since: 2.6
  **/
 void
-gtk_tree_view_set_row_separator_func (GtkTreeView                *tree_view,
-                                     GtkTreeViewRowSeparatorFunc func,
-                                     gpointer                    data,
-                                     GtkDestroyNotify            destroy)
+gtk_tree_view_set_row_separator_func (GtkTreeView                 *tree_view,
+                                     GtkTreeViewRowSeparatorFunc  func,
+                                     gpointer                     data,
+                                     GDestroyNotify               destroy)
 {
   g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
 

diff --git a/gtk/gtktreeview.h b/gtk/gtktreeview.h
index 9a39299ce1feeeb4dd16657761bbb36b5c84b7a4..e34856a13be09e2c484d4fe84811310142fc2d57 100644 (file)
--- a/gtk/gtktreeview.h
+++ b/gtk/gtktreeview.h
@@ -197,7 +197,7 @@ GtkTreeViewColumn     *gtk_tree_view_get_expander_column           (GtkTreeView
 void                   gtk_tree_view_set_column_drag_function      (GtkTreeView               *tree_view,
                                                                    GtkTreeViewColumnDropFunc  func,
                                                                    gpointer                   user_data,
-                                                                   GtkDestroyNotify           destroy);
+                                                                   GDestroyNotify             destroy);
 
 /* Actions */
 void                   gtk_tree_view_scroll_to_point               (GtkTreeView               *tree_view,
@@ -319,7 +319,7 @@ GtkTreeViewSearchEqualFunc gtk_tree_view_get_search_equal_func (GtkTreeView
 void                       gtk_tree_view_set_search_equal_func (GtkTreeView                *tree_view,
                                                                GtkTreeViewSearchEqualFunc  search_equal_func,
                                                                gpointer                    search_user_data,
-                                                               GtkDestroyNotify            search_destroy);
+                                                               GDestroyNotify              search_destroy);
 
 GtkEntry                     *gtk_tree_view_get_search_entry         (GtkTreeView                   *tree_view);
 void                          gtk_tree_view_set_search_entry         (GtkTreeView                   *tree_view,
@@ -371,7 +371,7 @@ typedef void (* GtkTreeDestroyCountFunc)  (GtkTreeView             *tree_view,
 void gtk_tree_view_set_destroy_count_func (GtkTreeView             *tree_view,
                                           GtkTreeDestroyCountFunc  func,
                                           gpointer                 data,
-                                          GtkDestroyNotify         destroy);
+                                          GDestroyNotify           destroy);
 
 void     gtk_tree_view_set_fixed_height_mode (GtkTreeView          *tree_view,
                                              gboolean              enable);
@@ -392,7 +392,7 @@ GtkTreeViewRowSeparatorFunc gtk_tree_view_get_row_separator_func (GtkTreeView
 void                        gtk_tree_view_set_row_separator_func (GtkTreeView                *tree_view,
                                                                  GtkTreeViewRowSeparatorFunc func,
                                                                  gpointer                    data,
-                                                                 GtkDestroyNotify            destroy);
+                                                                 GDestroyNotify              destroy);
 
 GtkTreeViewGridLines        gtk_tree_view_get_grid_lines         (GtkTreeView                *tree_view);
 void                        gtk_tree_view_set_grid_lines         (GtkTreeView                *tree_view,

diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index bd781066db769f1d391ada6eaeda19633ab255d7..edb415c59d825b2c8a9a47ff3e1ad93670d412ae 100644 (file)
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -67,7 +67,7 @@ struct _GtkTreeViewColumnCellInfo
   GSList *attributes;
   GtkTreeCellDataFunc func;
   gpointer func_data;
-  GtkDestroyNotify destroy;
+  GDestroyNotify destroy;
   gint requested_width;
   gint real_width;
   guint expand : 1;
@@ -391,7 +391,7 @@ gtk_tree_view_column_finalize (GObject *object)
 
       if (info->destroy)
        {
-         GtkDestroyNotify d = info->destroy;
+         GDestroyNotify d = info->destroy;
 
          info->destroy = NULL;
          d (info->func_data);
@@ -1663,7 +1663,7 @@ gtk_tree_view_column_set_cell_data_func (GtkTreeViewColumn   *tree_column,
                                         GtkCellRenderer     *cell_renderer,
                                         GtkTreeCellDataFunc  func,
                                         gpointer             func_data,
-                                        GtkDestroyNotify     destroy)
+                                        GDestroyNotify       destroy)
 {
   gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (tree_column),
                                       cell_renderer,

diff --git a/gtk/gtktreeviewcolumn.h b/gtk/gtktreeviewcolumn.h
index 6419558950f71ae7f1afd56e4326c190351bc7db..3337fc3d0408717c3f16b3bf357804bbb540a9c7 100644 (file)
--- a/gtk/gtktreeviewcolumn.h
+++ b/gtk/gtktreeviewcolumn.h
@@ -148,7 +148,7 @@ void                    gtk_tree_view_column_set_cell_data_func  (GtkTreeViewCol
                                                                  GtkCellRenderer         *cell_renderer,
                                                                  GtkTreeCellDataFunc      func,
                                                                  gpointer                 func_data,
-                                                                 GtkDestroyNotify         destroy);
+                                                                 GDestroyNotify           destroy);
 void                    gtk_tree_view_column_clear_attributes    (GtkTreeViewColumn       *tree_column,
                                                                  GtkCellRenderer         *cell_renderer);
 void                    gtk_tree_view_column_set_spacing         (GtkTreeViewColumn       *tree_column,

diff --git a/gtk/gtktypeutils.h b/gtk/gtktypeutils.h
index 71a675616cb6e61b83d3bc041a99e386aab3a5af..03350713178e781324e73552433110d4cc2dee0a 100644 (file)
--- a/gtk/gtktypeutils.h
+++ b/gtk/gtktypeutils.h
@@ -115,7 +115,6 @@ GType gtk_identifier_get_type (void) G_GNUC_CONST;
 typedef struct _GtkArg              GtkArg;
 typedef struct _GtkObject           GtkObject; /* object forward declaration */
 typedef gboolean (*GtkFunction)            (gpointer      data);
-typedef void (*GtkDestroyNotify)    (gpointer      data);
 typedef void (*GtkCallbackMarshal)  (GtkObject    *object,
                                     gpointer      data,
                                     guint         n_args,
@@ -123,6 +122,7 @@ typedef void (*GtkCallbackMarshal)  (GtkObject    *object,
 
 #ifndef GTK_DISABLE_DEPRECATED
 
+typedef void (*GtkDestroyNotify)    (gpointer      data);
 typedef void (*GtkSignalFunc)       (void);
 
 #endif /* GTK_DISABLE_DEPRECATED */